Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 25 Oct 2015 19:36:02 +0000 (20:36 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 25 Oct 2015 19:36:02 +0000 (20:36 +0100)

Trivial merge